Manual merge of version 0.1.5-1+rpi1 and 0.3.1-3 to produce 0.3.1-3+rpi1

diff --cc debian/changelog
index e1c894490ab229bb13d93c9502af022398f600b7,31a66c515794950d5e8ca7c0582faeb828bd7e3d..cd95a84aff30466be4eb03331c9d7618419e535a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,24 +1,31 @@@
- haskell-nothunks (0.1.5-1+rpi1) trixie-staging; urgency=medium
++haskell-nothunks (0.3.1-3+rpi1) forky-staging; urgency=medium
 +
++  [changes brought forward from 0.1.5-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Nov 2024 16:33:05 +0000]
 +  * Force C.UTF-8 locale for build.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 07 Nov 2024 16:33:05 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Mar 2026 12:39:12 +0000
++
+ haskell-nothunks (0.3.1-3) unstable; urgency=medium
+ 
+   * Fix typo in patch.
+ 
+  -- Clint Adams <clint@debian.org>  Mon, 19 Jan 2026 17:00:23 -0500
+ 
+ haskell-nothunks (0.3.1-2) unstable; urgency=medium
+ 
+   * Patch for newer and older dependencies.
+ 
+  -- Clint Adams <clint@debian.org>  Mon, 19 Jan 2026 16:27:06 -0500
+ 
+ haskell-nothunks (0.3.1-1) unstable; urgency=medium
+ 
+   [ Scott Talbert ]
+   * Build using dh-haskell
+ 
+   [ Clint Adams ]
+   * New upstream version.
+ 
+  -- Clint Adams <clint@debian.org>  Mon, 19 Jan 2026 12:07:21 -0500
  
  haskell-nothunks (0.1.5-1) unstable; urgency=medium
  

diff --cc debian/rules
index 53a71efcfbdaab40d6421702f661343d894df4a2,7a9e76c21404a6c89674dd69a9bfc561fbed08ca..4090d8bfaf89e8b7e3dc4b6134ed68325359436e
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -1,8 -1,6 +1,6 @@@
  #!/usr/bin/make -f
  
 -export DEB_ENABLE_TESTS = yes
 +export LC_ALL=C.UTF-8
  
- DEB_ENABLE_TESTS = yes
- 
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/hlibrary.mk
+ %:
+       dh $@